dgit.raspbian.org Git - emacs.git/commit

projects / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 14cf57a 11d675c)

author	Glenn Morris <rgm@gnu.org>
	Sun, 24 Feb 2013 19:45:17 +0000 (11:45 -0800)
committer	Glenn Morris <rgm@gnu.org>
	Sun, 24 Feb 2013 19:45:17 +0000 (11:45 -0800)
commit	b2feab91b00423d05cb70bbc680073d0186000cc
tree	11c82211c370bb475ee7942e777dd7b1d6eafbf9	tree \| snapshot
parent	14cf57a78b1c368b3a8a6fc17c91faddf9af8280	commit \| diff
parent	11d675cbb227da17780677fb57667d8190933a1e	commit \| diff

Merge from emacs-24; up to r111297

doc/lispref/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/lispref/files.texi	diff1 \|	diff2 \|	blob \| history
doc/misc/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/misc/tramp.texi	diff1 \|	diff2 \|	blob \| history
etc/TODO	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/filelock.c	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.